From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 17 Jul 2011 01:34:49 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2464^2~79
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bd41d1b717a1f57fa2b6df451085c28cde4a1871;p=emacs.git

Merge from trunk.
---

bd41d1b717a1f57fa2b6df451085c28cde4a1871